rbtree: Privatize header
authorBenjamin Otte <otte@redhat.com>
Sat, 3 Feb 2018 14:47:41 +0000 (15:47 +0100)
committerBenjamin Otte <otte@redhat.com>
Sat, 3 Feb 2018 15:24:13 +0000 (16:24 +0100)
According to meson it's the only private header that doesn't conform to
the *private.h naming.

Fix that.

gtk/gtkrbtree.c
gtk/gtkrbtree.h [deleted file]
gtk/gtkrbtreeprivate.h [new file with mode: 0644]
gtk/gtktreeprivate.h
gtk/gtktreeselection.c
gtk/gtktreeview.c
gtk/meson.build
testsuite/gtk/rbtree.c

index 464b785b05925e8ae80994c6979c7345fc1ba910..a21b093d5ebbbdcfb30b9352e995a217aaf5df59 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 #include "config.h"
-#include "gtkrbtree.h"
+#include "gtkrbtreeprivate.h"
 #include "gtkdebug.h"
 
 static GtkRBNode * _gtk_rbnode_new                (GtkRBTree  *tree,
diff --git a/gtk/gtkrbtree.h b/gtk/gtkrbtree.h
deleted file mode 100644 (file)
index 9e088a1..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-/* gtkrbtree.h
- * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/* A Red-Black Tree implementation used specifically by GtkTreeView.
- */
-#ifndef __GTK_RBTREE_H__
-#define __GTK_RBTREE_H__
-
-#include <glib.h>
-
-
-G_BEGIN_DECLS
-
-
-typedef enum
-{
-  GTK_RBNODE_BLACK = 1 << 0,
-  GTK_RBNODE_RED = 1 << 1,
-  GTK_RBNODE_IS_PARENT = 1 << 2,
-  GTK_RBNODE_IS_SELECTED = 1 << 3,
-  GTK_RBNODE_IS_PRELIT = 1 << 4,
-  GTK_RBNODE_INVALID = 1 << 7,
-  GTK_RBNODE_COLUMN_INVALID = 1 << 8,
-  GTK_RBNODE_DESCENDANTS_INVALID = 1 << 9,
-  GTK_RBNODE_NON_COLORS = GTK_RBNODE_IS_PARENT |
-                         GTK_RBNODE_IS_SELECTED |
-                         GTK_RBNODE_IS_PRELIT |
-                          GTK_RBNODE_INVALID |
-                          GTK_RBNODE_COLUMN_INVALID |
-                          GTK_RBNODE_DESCENDANTS_INVALID
-} GtkRBNodeColor;
-
-typedef struct _GtkRBTree GtkRBTree;
-typedef struct _GtkRBNode GtkRBNode;
-typedef struct _GtkRBTreeView GtkRBTreeView;
-
-typedef void (*GtkRBTreeTraverseFunc) (GtkRBTree  *tree,
-                                       GtkRBNode  *node,
-                                       gpointer  data);
-
-struct _GtkRBTree
-{
-  GtkRBNode *root;
-  GtkRBTree *parent_tree;
-  GtkRBNode *parent_node;
-};
-
-struct _GtkRBNode
-{
-  guint flags : 14;
-
-  /* count is the number of nodes beneath us, plus 1 for ourselves.
-   * i.e. node->left->count + node->right->count + 1
-   */
-  gint count;
-
-  GtkRBNode *left;
-  GtkRBNode *right;
-  GtkRBNode *parent;
-
-  /* count the number of total nodes beneath us, including nodes
-   * of children trees.
-   * i.e. node->left->count + node->right->count + node->children->root->count + 1
-   */
-  guint total_count;
-  
-  /* this is the total of sizes of
-   * node->left, node->right, our own height, and the height
-   * of all trees in ->children, iff children exists because
-   * the thing is expanded.
-   */
-  gint offset;
-
-  /* Child trees */
-  GtkRBTree *children;
-};
-
-
-#define GTK_RBNODE_GET_COLOR(node)             (node?(((node->flags&GTK_RBNODE_RED)==GTK_RBNODE_RED)?GTK_RBNODE_RED:GTK_RBNODE_BLACK):GTK_RBNODE_BLACK)
-#define GTK_RBNODE_SET_COLOR(node,color)       if((node->flags&color)!=color)node->flags=node->flags^(GTK_RBNODE_RED|GTK_RBNODE_BLACK)
-#define GTK_RBNODE_GET_HEIGHT(node)            (node->offset-(node->left->offset+node->right->offset+(node->children?node->children->root->offset:0)))
-#define GTK_RBNODE_SET_FLAG(node, flag)        G_STMT_START{ (node->flags|=flag); }G_STMT_END
-#define GTK_RBNODE_UNSET_FLAG(node, flag)      G_STMT_START{ (node->flags&=~(flag)); }G_STMT_END
-#define GTK_RBNODE_FLAG_SET(node, flag)        (node?(((node->flags&flag)==flag)?TRUE:FALSE):FALSE)
-
-
-GtkRBTree *_gtk_rbtree_new              (void);
-void       _gtk_rbtree_free             (GtkRBTree              *tree);
-void       _gtk_rbtree_remove           (GtkRBTree              *tree);
-void       _gtk_rbtree_destroy          (GtkRBTree              *tree);
-GtkRBNode *_gtk_rbtree_insert_before    (GtkRBTree              *tree,
-                                        GtkRBNode              *node,
-                                        gint                    height,
-                                        gboolean                valid);
-GtkRBNode *_gtk_rbtree_insert_after     (GtkRBTree              *tree,
-                                        GtkRBNode              *node,
-                                        gint                    height,
-                                        gboolean                valid);
-void       _gtk_rbtree_remove_node      (GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-gboolean   _gtk_rbtree_is_nil           (GtkRBNode              *node);
-void       _gtk_rbtree_reorder          (GtkRBTree              *tree,
-                                        gint                   *new_order,
-                                        gint                    length);
-gboolean   _gtk_rbtree_contains         (GtkRBTree              *tree,
-                                         GtkRBTree              *potential_child);
-GtkRBNode *_gtk_rbtree_find_count       (GtkRBTree              *tree,
-                                        gint                    count);
-void       _gtk_rbtree_node_set_height  (GtkRBTree              *tree,
-                                        GtkRBNode              *node,
-                                        gint                    height);
-void       _gtk_rbtree_node_mark_invalid(GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-void       _gtk_rbtree_node_mark_valid  (GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-void       _gtk_rbtree_column_invalid   (GtkRBTree              *tree);
-void       _gtk_rbtree_mark_invalid     (GtkRBTree              *tree);
-void       _gtk_rbtree_set_fixed_height (GtkRBTree              *tree,
-                                        gint                    height,
-                                        gboolean                mark_valid);
-gint       _gtk_rbtree_node_find_offset (GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-guint      _gtk_rbtree_node_get_index   (GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-gboolean   _gtk_rbtree_find_index       (GtkRBTree              *tree,
-                                        guint                   index,
-                                        GtkRBTree             **new_tree,
-                                        GtkRBNode             **new_node);
-gint       _gtk_rbtree_find_offset      (GtkRBTree              *tree,
-                                        gint                    offset,
-                                        GtkRBTree             **new_tree,
-                                        GtkRBNode             **new_node);
-void       _gtk_rbtree_traverse         (GtkRBTree              *tree,
-                                        GtkRBNode              *node,
-                                        GTraverseType           order,
-                                        GtkRBTreeTraverseFunc   func,
-                                        gpointer                data);
-GtkRBNode *_gtk_rbtree_first            (GtkRBTree              *tree);
-GtkRBNode *_gtk_rbtree_next             (GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-GtkRBNode *_gtk_rbtree_prev             (GtkRBTree              *tree,
-                                        GtkRBNode              *node);
-void       _gtk_rbtree_next_full        (GtkRBTree              *tree,
-                                        GtkRBNode              *node,
-                                        GtkRBTree             **new_tree,
-                                        GtkRBNode             **new_node);
-void       _gtk_rbtree_prev_full        (GtkRBTree              *tree,
-                                        GtkRBNode              *node,
-                                        GtkRBTree             **new_tree,
-                                        GtkRBNode             **new_node);
-
-gint       _gtk_rbtree_get_depth        (GtkRBTree              *tree);
-
-
-G_END_DECLS
-
-
-#endif /* __GTK_RBTREE_H__ */
diff --git a/gtk/gtkrbtreeprivate.h b/gtk/gtkrbtreeprivate.h
new file mode 100644 (file)
index 0000000..7d0e2ff
--- /dev/null
@@ -0,0 +1,172 @@
+/* gtkrbtreeprivate.h
+ * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* A Red-Black Tree implementation used specifically by GtkTreeView.
+ */
+#ifndef __GTK_RBTREE_PRIVATE_H__
+#define __GTK_RBTREE_PRIVATE_H__
+
+#include <glib.h>
+
+
+G_BEGIN_DECLS
+
+
+typedef enum
+{
+  GTK_RBNODE_BLACK = 1 << 0,
+  GTK_RBNODE_RED = 1 << 1,
+  GTK_RBNODE_IS_PARENT = 1 << 2,
+  GTK_RBNODE_IS_SELECTED = 1 << 3,
+  GTK_RBNODE_IS_PRELIT = 1 << 4,
+  GTK_RBNODE_INVALID = 1 << 7,
+  GTK_RBNODE_COLUMN_INVALID = 1 << 8,
+  GTK_RBNODE_DESCENDANTS_INVALID = 1 << 9,
+  GTK_RBNODE_NON_COLORS = GTK_RBNODE_IS_PARENT |
+                         GTK_RBNODE_IS_SELECTED |
+                         GTK_RBNODE_IS_PRELIT |
+                          GTK_RBNODE_INVALID |
+                          GTK_RBNODE_COLUMN_INVALID |
+                          GTK_RBNODE_DESCENDANTS_INVALID
+} GtkRBNodeColor;
+
+typedef struct _GtkRBTree GtkRBTree;
+typedef struct _GtkRBNode GtkRBNode;
+typedef struct _GtkRBTreeView GtkRBTreeView;
+
+typedef void (*GtkRBTreeTraverseFunc) (GtkRBTree  *tree,
+                                       GtkRBNode  *node,
+                                       gpointer  data);
+
+struct _GtkRBTree
+{
+  GtkRBNode *root;
+  GtkRBTree *parent_tree;
+  GtkRBNode *parent_node;
+};
+
+struct _GtkRBNode
+{
+  guint flags : 14;
+
+  /* count is the number of nodes beneath us, plus 1 for ourselves.
+   * i.e. node->left->count + node->right->count + 1
+   */
+  gint count;
+
+  GtkRBNode *left;
+  GtkRBNode *right;
+  GtkRBNode *parent;
+
+  /* count the number of total nodes beneath us, including nodes
+   * of children trees.
+   * i.e. node->left->count + node->right->count + node->children->root->count + 1
+   */
+  guint total_count;
+  
+  /* this is the total of sizes of
+   * node->left, node->right, our own height, and the height
+   * of all trees in ->children, iff children exists because
+   * the thing is expanded.
+   */
+  gint offset;
+
+  /* Child trees */
+  GtkRBTree *children;
+};
+
+
+#define GTK_RBNODE_GET_COLOR(node)             (node?(((node->flags&GTK_RBNODE_RED)==GTK_RBNODE_RED)?GTK_RBNODE_RED:GTK_RBNODE_BLACK):GTK_RBNODE_BLACK)
+#define GTK_RBNODE_SET_COLOR(node,color)       if((node->flags&color)!=color)node->flags=node->flags^(GTK_RBNODE_RED|GTK_RBNODE_BLACK)
+#define GTK_RBNODE_GET_HEIGHT(node)            (node->offset-(node->left->offset+node->right->offset+(node->children?node->children->root->offset:0)))
+#define GTK_RBNODE_SET_FLAG(node, flag)        G_STMT_START{ (node->flags|=flag); }G_STMT_END
+#define GTK_RBNODE_UNSET_FLAG(node, flag)      G_STMT_START{ (node->flags&=~(flag)); }G_STMT_END
+#define GTK_RBNODE_FLAG_SET(node, flag)        (node?(((node->flags&flag)==flag)?TRUE:FALSE):FALSE)
+
+
+GtkRBTree *_gtk_rbtree_new              (void);
+void       _gtk_rbtree_free             (GtkRBTree              *tree);
+void       _gtk_rbtree_remove           (GtkRBTree              *tree);
+void       _gtk_rbtree_destroy          (GtkRBTree              *tree);
+GtkRBNode *_gtk_rbtree_insert_before    (GtkRBTree              *tree,
+                                        GtkRBNode              *node,
+                                        gint                    height,
+                                        gboolean                valid);
+GtkRBNode *_gtk_rbtree_insert_after     (GtkRBTree              *tree,
+                                        GtkRBNode              *node,
+                                        gint                    height,
+                                        gboolean                valid);
+void       _gtk_rbtree_remove_node      (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+gboolean   _gtk_rbtree_is_nil           (GtkRBNode              *node);
+void       _gtk_rbtree_reorder          (GtkRBTree              *tree,
+                                        gint                   *new_order,
+                                        gint                    length);
+gboolean   _gtk_rbtree_contains         (GtkRBTree              *tree,
+                                         GtkRBTree              *potential_child);
+GtkRBNode *_gtk_rbtree_find_count       (GtkRBTree              *tree,
+                                        gint                    count);
+void       _gtk_rbtree_node_set_height  (GtkRBTree              *tree,
+                                        GtkRBNode              *node,
+                                        gint                    height);
+void       _gtk_rbtree_node_mark_invalid(GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+void       _gtk_rbtree_node_mark_valid  (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+void       _gtk_rbtree_column_invalid   (GtkRBTree              *tree);
+void       _gtk_rbtree_mark_invalid     (GtkRBTree              *tree);
+void       _gtk_rbtree_set_fixed_height (GtkRBTree              *tree,
+                                        gint                    height,
+                                        gboolean                mark_valid);
+gint       _gtk_rbtree_node_find_offset (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+guint      _gtk_rbtree_node_get_index   (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+gboolean   _gtk_rbtree_find_index       (GtkRBTree              *tree,
+                                        guint                   index,
+                                        GtkRBTree             **new_tree,
+                                        GtkRBNode             **new_node);
+gint       _gtk_rbtree_find_offset      (GtkRBTree              *tree,
+                                        gint                    offset,
+                                        GtkRBTree             **new_tree,
+                                        GtkRBNode             **new_node);
+void       _gtk_rbtree_traverse         (GtkRBTree              *tree,
+                                        GtkRBNode              *node,
+                                        GTraverseType           order,
+                                        GtkRBTreeTraverseFunc   func,
+                                        gpointer                data);
+GtkRBNode *_gtk_rbtree_first            (GtkRBTree              *tree);
+GtkRBNode *_gtk_rbtree_next             (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+GtkRBNode *_gtk_rbtree_prev             (GtkRBTree              *tree,
+                                        GtkRBNode              *node);
+void       _gtk_rbtree_next_full        (GtkRBTree              *tree,
+                                        GtkRBNode              *node,
+                                        GtkRBTree             **new_tree,
+                                        GtkRBNode             **new_node);
+void       _gtk_rbtree_prev_full        (GtkRBTree              *tree,
+                                        GtkRBNode              *node,
+                                        GtkRBTree             **new_tree,
+                                        GtkRBNode             **new_node);
+
+gint       _gtk_rbtree_get_depth        (GtkRBTree              *tree);
+
+
+G_END_DECLS
+
+
+#endif /* __GTK_RBTREE_PRIVATE_H__ */
index 0fc888ee3fca3cb0e9ec15c2068cf3f61c76f5a0..50a99828bd777378bf18aeccf82e57addde88905 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <gtk/gtktreeview.h>
 #include <gtk/gtktreeselection.h>
-#include <gtk/gtkrbtree.h>
+#include <gtk/gtkrbtreeprivate.h>
 
 G_BEGIN_DECLS
 
index 1bb43fcc3d54c65bb5a2cdb1ef685b1b6d645a1e..1a4db396ef9016e5c8faee2c6a4173c5418d0d57 100644 (file)
@@ -19,7 +19,7 @@
 #include <string.h>
 #include "gtktreeselection.h"
 #include "gtktreeprivate.h"
-#include "gtkrbtree.h"
+#include "gtkrbtreeprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
index eca6182a49fab1726d554159a4ff67139df568e2..b9433e56e68dcc779245b993114e28977c49857d 100644 (file)
@@ -28,7 +28,7 @@
 
 #include "gtkadjustmentprivate.h"
 #include "gtkcssnumbervalueprivate.h"
-#include "gtkrbtree.h"
+#include "gtkrbtreeprivate.h"
 #include "gtktreednd.h"
 #include "gtktreeprivate.h"
 #include "gtkcellrenderer.h"
index e3e5c7d350c823c2797fdd9a3101bc8bfb475699..b0888d53653e04b882737b2a1d44fab4e27e8310 100644 (file)
@@ -366,10 +366,6 @@ gtk_private_type_headers = files([
   'gtkeventcontrollerlegacyprivate.h',
 ])
 
-gtk_private_headers = gtk_private_type_headers + files([
-  'gtkrbtree.h',
-])
-
 gtk_public_headers = files([
   'gtkaboutdialog.h',
   'gtkaccelgroup.h',
@@ -748,7 +744,6 @@ typefuncs = custom_target('gtktypefuncs.inc',
                           input: gdk_headers +
                             gtk_public_headers +
                             gtk_deprecated_headers +
-                            gtk_private_headers +
                             [ gtktypebuiltins_h, ] +
                             [ gdkenum_h, gskenum_h, ],
                           command: [
index e73089776429a60f58f856db91c3d1fd8e75d012..513c6abb67e2a0a2b3ab3c6684efd73d6ee1afa2 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <locale.h>
 
-#include "../../gtk/gtkrbtree.h"
+#include "../../gtk/gtkrbtreeprivate.h"
 
 /* _gtk_rbtree_test */